Fix handling of auto-generated file xsm.py.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/.hgignore b/.hgignore
index 0b155addc5ff629bd6c648a72a0d812faad1dd5f..2f1962d1a0b08d4a6582810bf2dfbdeb464e8198 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -149,6 +149,7 @@
 ^tools/misc/xenperf$
 ^tools/pygrub/build/.*$
 ^tools/python/build/.*$
+^tools/python/xen/util/xsm/xsm\.py$
 ^tools/security/secpol_tool$
 ^tools/security/xen/.*$
 ^tools/security/xensec_tool$

diff --git a/tools/python/Makefile b/tools/python/Makefile
index 832808237a5a696b311d8641f04c59466f9f4ef5..880a19c9ff86ff9de7efa2ab4a5b2c6355085440 100644 (file)
--- a/tools/python/Makefile
+++ b/tools/python/Makefile
@@ -23,10 +23,10 @@ CATALOGS = $(patsubst %,xen/xm/messages/%.mo,$(LINGUAS))
 NLSDIR = /usr/share/locale
 
 .PHONY: build buildpy
-buildpy:
+buildpy: xsm.py
        CC="$(CC)" CFLAGS="$(CFLAGS)" XEN_SECURITY_MODULE="$(XEN_SECURITY_MODULE)" python setup.py build
 
-build: xsm.py buildpy refresh-pot refresh-po $(CATALOGS)
+build: buildpy refresh-pot refresh-po $(CATALOGS)
 
 # NB we take care to only update the .pot file it strings have
 # actually changed. This is complicated by the embedded date

diff --git a/tools/python/xen/util/xsm/xsm.py b/tools/python/xen/util/xsm/xsm.py
deleted file mode 100644 (file)
index 92b8c30..0000000
--- a/tools/python/xen/util/xsm/xsm.py
+++ /dev/null
@@ -1,9 +0,0 @@
-XEN_SECURITY_MODULE = "flask"
-from xsm_core import *
-
-import xen.util.xsm.flask.flask as xsm_module
-
-xsm_init(xsm_module)
-from xen.util.xsm.flask.flask import *
-del xsm_module
-